GtkTooltip: Move nonexported API to a private header

This is our standard practice nowadays.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8f986091a5a9a5fd4fc11fbfec936df69301ec70..ee3293274a7252ed39165ec70f003e2d0a16ea5b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -672,6 +672,7 @@ gtk_private_h_sources =             \
        gtktogglebuttonprivate.h \
        gtktoolbarprivate.h     \
        gtktoolpaletteprivate.h \
+       gtktooltipprivate.h     \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwidgetprivate.h      \

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 6d2ad0e83d7d41544bf8d102262b8564e2063f95..50914e276e656a6d9da822e54c09705b88a3822b 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -48,7 +48,7 @@
 #include "gtkicontheme.h"
 #include "gtkmain.h"
 #include "gtkplug.h"
-#include "gtktooltip.h"
+#include "gtktooltipprivate.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkselectionprivate.h"

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d8c344f750412380cb0811bd8df54dc07e6f383b..e19691c0c573b76cdfc57861945c4617d3a4cc99 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -123,7 +123,7 @@
 #include "gtkrecentmanager.h"
 #include "gtkselectionprivate.h"
 #include "gtksettingsprivate.h"
-#include "gtktooltip.h"
+#include "gtktooltipprivate.h"
 #include "gtkversion.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 103944f2f0e2e043c7155d3e36e15e49ede3f8b7..8c3f2dfb282e10272cceb60d03988e22199a51dd 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #include "gtktooltip.h"
+#include "gtktooltipprivate.h"
 
 #include <math.h>
 #include <string.h>

diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index 7af3c42a45e7c3955542120dd981d00985a42f08..87a105f585cf7b1b421b004e9a4e15eadb9921f3 100644 (file)
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -68,18 +68,6 @@ GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_trigger_tooltip_query   (GdkDisplay         *display);
 
 
-void _gtk_tooltip_focus_in               (GtkWidget          *widget);
-void _gtk_tooltip_focus_out              (GtkWidget          *widget);
-void _gtk_tooltip_toggle_keyboard_mode   (GtkWidget          *widget);
-void _gtk_tooltip_handle_event           (GdkEvent           *event);
-void _gtk_tooltip_hide                   (GtkWidget          *widget);
-
-GtkWidget * _gtk_widget_find_at_coords   (GdkWindow          *window,
-                                          gint                window_x,
-                                          gint                window_y,
-                                          gint               *widget_x,
-                                          gint               *widget_y);
-
 G_END_DECLS
 
 #endif /* __GTK_TOOLTIP_H__ */

diff --git a/gtk/gtktooltipprivate.h b/gtk/gtktooltipprivate.h
new file mode 100644 (file)
index 0000000..427015e
--- /dev/null
+++ b/gtk/gtktooltipprivate.h
@@ -0,0 +1,49 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_TOOLTIP_PRIVATE_H__
+#define __GTK_TOOLTIP_PRIVATE_H__
+
+
+#include <gtk/gtktooltip.h>
+
+
+G_BEGIN_DECLS
+
+void _gtk_tooltip_focus_in               (GtkWidget          *widget);
+void _gtk_tooltip_focus_out              (GtkWidget          *widget);
+void _gtk_tooltip_toggle_keyboard_mode   (GtkWidget          *widget);
+void _gtk_tooltip_handle_event           (GdkEvent           *event);
+void _gtk_tooltip_hide                   (GtkWidget          *widget);
+
+GtkWidget * _gtk_widget_find_at_coords   (GdkWindow          *window,
+                                          gint                window_x,
+                                          gint                window_y,
+                                          gint               *widget_x,
+                                          gint               *widget_y);
+
+G_END_DECLS
+
+
+#endif /* __GTK_TOOLTIP_PRIVATE_H__ */

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 000851928221f0e4de045600103f1c9aba948a6e..a993db3f4d9ffbc7e7035fb3ddb66f911aba5ae4 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -53,7 +53,7 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkaccessible.h"
-#include "gtktooltip.h"
+#include "gtktooltipprivate.h"
 #include "gtkinvisible.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"